Commit graph

20247 commits

Author SHA1 Message Date
Hank Grabowski
a8d69c48dc OpenID Scopes and Security updates 2018-12-26 14:13:13 -05:00
Frank Rousseau
6ba26496ec
Merge pull request #20 from frankrousseau/api-paging-updates
API Paging Updates
2018-12-18 13:44:18 +01:00
Hank Grabowski
7109773b83 API Paging library and used in appropriate controllers with full tests 2018-12-17 22:07:33 -05:00
Frank Rousseau
43c111bd98
Merge pull request #21 from frankrousseau/api-poll-participation-updates
API Poll Participation
2018-12-16 17:23:27 +01:00
Hank Grabowski
ff6d0064d0 Add Poll Voting Method to Interactions Endpoint 2018-12-16 11:06:27 -05:00
Frank Rousseau
32157036d3
Merge pull request #17 from frankrousseau/api-photos-updates
Photos API Endpoint
2018-12-11 01:16:05 +01:00
Hank Grabowski
8851f664e5 Photos API Endpoint and unit tests complete 2018-12-10 12:43:50 -05:00
Frank Rousseau
f284d379dd
Merge pull request #19 from frankrousseau/api-search-updates
API Search Endpoint
2018-12-04 15:46:48 +01:00
Hank Grabowski
68d7d59286 Search API Endpoint and unit test complete 2018-12-04 09:24:17 -05:00
Frank Rousseau
df756c5f9f
Merge pull request #15 from frankrousseau/api-users-updates
User API Updates
2018-12-04 15:06:33 +01:00
Hank Grabowski
c3852a8e9c Users Controller and unit tests complete 2018-12-04 08:48:16 -05:00
Frank Rousseau
a5bdabea9b
Merge pull request #18 from frankrousseau/api-notifications-updates
API Notifications Endpoint
2018-12-04 14:01:58 +01:00
Hank Grabowski
ef762c4920 Notifications API Endpoint and unit test complete 2018-12-04 07:51:57 -05:00
Frank Rousseau
2bfeefe3b3
Merge pull request #16 from frankrousseau/api-interactions-updates
Interactions API Endpoint
2018-12-04 09:22:53 +01:00
Hank Grabowski
6e469825cd Interactions API endpoint complete with full tests 2018-12-03 20:56:50 -05:00
Frank Rousseau
3257e569b9
Merge pull request #14 from frankrousseau/api-contacts-updates
Contacts API Endpoint Complete with Tests
2018-12-02 02:23:57 +01:00
HankG
8a60870f04 Contacts API Feature complete with full tests 2018-12-01 15:21:16 -05:00
Benjamin Neff
6824ef5baf
Merge branch 'next-minor' into develop 2018-11-25 22:38:03 +01:00
Benjamin Neff
5a0381f832
Merge branch 'master' into next-minor 2018-11-25 22:37:43 +01:00
Benjamin Neff
6185355e92
Merge branch 'release/0.7.8.0' 2018-11-25 22:36:59 +01:00
Benjamin Neff
09a8c84ae0
updated 51 locale files [ci skip] 2018-11-25 22:34:46 +01:00
Besnik Bleta
5766a08b22
Better wording for the latest changes, part II and final
closes #7934
2018-11-25 22:32:20 +01:00
Besnik Bleta
440775f3b0
Better wording for the latest changes 2018-11-25 22:32:17 +01:00
Besnik Bleta
5ee85721f7
Fixing an oldsyntax error of considering %{actors} as a number, rather than a list of people’s usernames 2018-11-25 22:32:17 +01:00
Besnik Bleta
6c2b3a7b11
Update sq translations 2018-11-25 22:32:14 +01:00
Benjamin Neff
95032bae92
Fix typo in changelog for 0.7.8.0 2018-11-20 22:03:15 +01:00
Benjamin Neff
0d45e709f2
Merge branch 'next-minor' into develop 2018-11-19 00:51:10 +01:00
Benjamin Neff
2d6a68c28f
Start 0.7.9.0 cycle
[ci skip]
2018-11-19 00:50:04 +01:00
Benjamin Neff
5b0066a426
Merge branch 'next-minor' into develop 2018-11-18 19:36:51 +01:00
Benjamin Neff
8e170ab976
Add retry on travis to reduce random failures
closes #7932
2018-11-18 19:34:41 +01:00
Benjamin Neff
7a958bce69
Bump cucumber 2018-11-18 19:32:16 +01:00
Benjamin Neff
a09f7d73d8
Remove guard-cucumber
Looks dead, last commit over two years ago, and block upgrade of cucumber

See guard/guard-cucumber#36
2018-11-18 19:27:43 +01:00
Dennis Schubert
a6655c187d
Add DIASPORA_DOCKER_PORT env var to change the port exposed by Docker
Set default port to 3000 as this is the default in the diaspora.yml.example

fixes #7927

closes #7928
2018-11-18 19:27:20 +01:00
Benjamin Neff
24fbd59d21
Merge pull request #7931 from SuperTux88/update-gems
Update gems
2018-11-17 23:40:12 +01:00
Benjamin Neff
8fc75e8955
Bump twitter-text 2018-11-17 21:20:51 +01:00
Benjamin Neff
81c833c4e3
Bump rails-assets-pica 2018-11-17 21:20:05 +01:00
Benjamin Neff
5bc32d0aad
Bump rails-assets-cropperjs 2018-11-17 21:15:59 +01:00
Benjamin Neff
b30c4e4e97
Merge branch 'next-minor' into develop 2018-11-17 21:08:23 +01:00
Benjamin Neff
b24b31256e
Bump warden
closes #7930
2018-11-17 21:06:20 +01:00
Benjamin Neff
ce10791526
Bump guard 2018-11-17 21:05:42 +01:00
Benjamin Neff
6fb1e1f524
Bump jwt 2018-11-17 21:05:42 +01:00
Benjamin Neff
2210cf0038
Bump timers 2018-11-17 21:05:42 +01:00
Benjamin Neff
e1d65d50ab
Bump rack-oauth2 2018-11-17 21:05:41 +01:00
Benjamin Neff
5960b33df0
Bump nio4r 2018-11-17 21:05:41 +01:00
Benjamin Neff
72112f8bd7
Bump jsonpath 2018-11-17 21:05:41 +01:00
Benjamin Neff
f3568d9fb3
Bump http 2018-11-17 21:05:41 +01:00
Benjamin Neff
9b435f67de
Bump get_process_mem 2018-11-17 21:05:41 +01:00
Benjamin Neff
37ec02dbd0
Bump domain_name 2018-11-17 21:05:41 +01:00
Benjamin Neff
7f67d007a0
Bump bindata 2018-11-17 21:05:40 +01:00
Benjamin Neff
514a370f75
Bump mail 2018-11-17 21:05:40 +01:00